147aa374c1
Bug: 323948193
Test: Manual
Flag: NONE
Change-Id: I0bdfcaebf3de050ac850fe42c061c82ffebdb7c2
(cherry picked from commit e6f349b3dd)