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

Change-Id: I46a6c87751494afca6fdd13736d7a4877e3cc833
tree: a2404c78a8a24e5ce6c4b4692f8624d79bc03243
  1. core/
  2. services/
  3. tests/