Fixes: 137348817 Test: visual, robotests Change-Id: I165b1e859891c7897e837d82702582458cecbb0d (cherry picked from commit 49b1bc1545)
49b1bc1545