Merge "Make addUnwantedCapability method public" into pi-dev
am: 95f4b59348

Change-Id: I6d1676b72f125baf5b72e8718bd331a30b3c3c30
tree: 3eeee347f10afe73a9fb08040d2ddab28e5d202e
  1. core/
  2. services/
  3. tests/