Fix: 317163103 Test: visual verify Flag: EXEMPT bug fix Change-Id: I121dc44181c9c3d6cd1b46ee444371050337186b
d25fdc50d8
b6683ea552