d4e2eef13b
Fixes: 185962767
Test: manual
Change-Id: I3d2103b665f099a087545a97fdb84bc240b8d261
(cherry picked from commit c9bf0f6161)