Merge "Add ability to override subscriber capabilities."
am: d6cd4b241a

Change-Id: Id035d437e9b297ba70ba9231f6cfdd44e5b9c257
tree: 105fe083aa9a6924d70fb6acb70a01675ccebaab
  1. core/
  2. services/
  3. tests/