658a58674a
Test: manual
Fix: 194320733
Change-Id: I12adeaf37cee5a0fcf383641f24b7750f14daf27
(cherry picked from commit a1dcbce15a)