Merge "Fix testRegisterUsageCallback"
am: b583c2c911

Change-Id: I7ec1e3a05971e8e0448289e3c3f979fd7dcfe144
tree: 4cefbfbb93da026a8a10486a998bb7db0222beb2
  1. core/
  2. services/
  3. tests/