Bug: 36510340 Change-Id: I6559154a2ffc8e1da2c789b511e911188e177a0d (cherry picked from commit 21112fde6f2175060fc671bee7462b0658e8e952)