Test: visual Bug: 370850767 Flag: EXEMPT bug fix Change-Id: I41931b49e993806cc3de71c67f600faee2af241d