Bug: 171218636 Merged-In: I77cffc12306fafa5fdd79a426937f5ba232394a3 Change-Id: Ibd68bd742b6888c45994951a24cb133243ff3ac0