Merge "Fix testRegisterUsageCallback" am: b583c2c911
am: f5242645f6

Change-Id: If16708b5ce00dc374663e3c3dedd1d96342175f1
tree: 19ded3ef2cc7bfaf635c9cd11133130085ec9443
  1. core/
  2. services/
  3. tests/