Bug: 186387500 Change-Id: Iac5600b5192588bffd39155c65b84265bbaca127 Test: visual (cherry picked from commit 59f7c47d)