Test: visual Change-Id: I2cfb819778eeb969979aa2a3ed8c35744a63f875 Fixes: 36238774 (cherry picked from commit 368a8aec)