Test: visual Change-Id: I8065885ec3d2badd9d7c2116a6075eb48e2b7697 Fixes: 30292983 (cherry picked from commit 6cfc63a9)