Test: visual Change-Id: Ia28b7b074a240465598fc3559cd3bd3c584fcc5d Fixes: 36402044 (cherry picked from commit 9f05491c)