Bug: 15081617 Change-Id: Idb86b4dafe1de58e7019311c85cf9a1d2ccc029f (cherry picked from commit e5768fcc)