Merge "Actually @hide unwanted capability methods." into pi-dev
am: 078049e316

Change-Id: I80a88123b16c54734306da7e5dc0670972041648
tree: 9c00e0110ff9cf55a34e51b9396da94d0b774a89
  1. core/
  2. services/
  3. tests/