Bug: 15310025 Change-Id: I2fa267e5c448e28435f4737666a03b40f1f4a4d5 (cherry picked from commit 0621dd1d3c)
0621dd1d3c