Bug: 364612225 Test: visual Flag: EXEMPT bugfix Change-Id: I0d4c48ef6debfa82597db48a4320b0500f330b1b
a0e5f09d94
a538747a6a