Bug: 317151839 Test: presubmit Change-Id: I0c13087f31320a68c6282029127125d4e0f13983
Test: Visual Test Fix: 317149063 Change-Id: Ic9bfcbe0891bf2e8103c07dd692fe30ccbaf149c