Fixes: 152789575 Test: https://screenshot.googleplex.com/r3AtHp3TAh0 Change-Id: I22f7ee2a69f2df12ade16f50bf455651dbfce597