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

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