2f9ad4645e
Test: Manual
Flag: NONE
Fix: 328960039
Change-Id: I62c53c21bf850b7080e12086235cba28164f4d70
(cherry picked from commit 1956246b6e)