Bug: 8538755 (cherry picked from commit 02281051) Change-Id: I73ac883c07e3b55e7c9d54ce070d02557bcc5b8f