Bug: 15476051 (cherry picked from commit d47acaeecd) Change-Id: Iac79ce3602282a2780dd895995f42ab03f346ad4
d47acaeecd