Test: visual Change-Id: I7915c4ad1cd4bcb852a7bdd68e9f57fda7f985c6 Fixes: 71599427 (cherry picked from commit 914b7086)