Merge "Add hasUnwantedCapability method" into pi-dev
am: 3d735d02d6

Change-Id: I7feec81a3f1525055030ee16f34b8e7251e79b9b
tree: 0a97b8403dd5120eab6258a190c2bc95bcbc963c
  1. core/
  2. services/
  3. tests/