Bug: 112630210 Test: unit test Change-Id: I2de38d35f14b813d2837455a322acc2e00813e3b
bc29242288
7adb73f332