Bug: 129352433 Change-Id: I3c9594f9ed49208ef1d7bbc33e8083a0c733b1f8 Test: manually confirmed it works and looks correct