Bug: 193824089 Change-Id: I33068ca3a3017d81fbd40c59b980f08e23585478 Test: visual verify (cherry picked from commit 7feda7c8)