Merge "Fix setCapabilities." into pi-dev
am: cb42feb502

Change-Id: I13d7782a6c0c7b1f94137995bbb0d257a58d89c1
tree: 101fe69ca41b63b29d5c5f7fcc2e19db96b64411
  1. core/
  2. services/
  3. tests/