Bug: 138881088 Change-Id: I86bf4c7a495805d5912b102470e72a51e843a222 (cherry picked from commit a2cfc2d95e)
a2cfc2d95e