Merge "Fix testRegisterUsageCallback failure in setUp"
am: e358e840ab

Change-Id: I516bab9b9b6c5f48845f18d0e2ab8b47f0f809de
tree: b8fc07812ff607996ea89158e5040dedc1147207
  1. core/
  2. services/
  3. tests/