Test: visual Bug: 66957450 Change-Id: I6a34a35912e4dd4594565f88636ce89689d26f2f (cherry picked from commit e7476add)