Bug: 12015287 Change-Id: I2fa5daaa54cc7cc0cad9dee0828d751302cb5be7 (cherry picked from commit 4fc601a650)
4fc601a650