93c710b9ac
Test: manual
Fix: 233639924
Change-Id: Iaca90a1391078d56bd57fa5de097f34ec0425866
(cherry picked from commit aed1b074f3)