32bf6cd650
Bug: 142753423
Test: Manual
Change-Id: I1111fa15b9b677bb077478309a185e70e6784bce
(cherry picked from commit ca1c32537c)