Merge "Fix testRegisterUsageCallback" am: d0b9f983d6 am: 66674ce8fb
am: 6b8e9a0635

Change-Id: I2a64dcaa10cd4f26e6508be9bad1d4ecc1dc3d12