Bug: 279690992 Change-Id: Ied7c8b3cab9ef088e3e54ce4683d22cfd75f73e3 Test: PixelDoU (cherry picked from commit 474ef063)