Merge "Fix testRegisterUsageCallback failure in setUp"
am: c68f5313a2

Change-Id: I516bab9b9b6c5f48845f18d0e2ab8b47f0f809de