e790b217e1
Bug: 122593881
Test: Manual
Change-Id: Ia9ce1ede08309a0898c622bcd07a9e076443d98a
(cherry picked from commit 2bd3a0225b)