Test: visual Fixes: 161186825 Fixes: 163309955 Change-Id: I8e62eef0f32812380bc1d19d87d7611bd395eabb (cherry picked from commit e5f5be9f)