55ab9851a4
Bug: 138117089
Change-Id: Icb852e2e07d80c45ad3406ef432b89720887fccf
(cherry picked from commit e734efba8d)