Bug: 37544152 Test: none Change-Id: I2bac468f833c73cd282b1dac80b6553917996604 (cherry picked from commit e55c4469)