Change-Id: I74779471a3fb7b99b515203ddba3aca6b0cd588b Fix: 31791627 Test: Visual inspection
Bug: 2823530 Change-Id: Idbf46aa59f3c529a3a3ef2d7d4e607822b34f51d