Bug: 37616877 Change-Id: I2f187576c28d62f9bb8257c9b9295edb7a8e44c0 (cherry picked from commit 751e41eb66)
751e41eb66