bug:27340451 (cherry picked from commit de166544) Change-Id: Ie4400064d81e260b41bd1408a9ed54be8ca0479e