29f46c9628
Test: manual. See screenshot in b/201286923 Fix: 201286923 Change-Id: I5be4f723523befe359b922273d11f57fb9f0b3fd