Bug: 16031597 Change-Id: I8f79773e4d5219d3c8dc4696176cd42f8236c87b (cherry picked from commit d8295c9e49)
d8295c9e49