Test: visual Change-Id: Ic81d874511bf87fb0e8d9bf08e27346919ebc46e Fixes: 35990413 (cherry picked from commit c34e2496)