Merge "Fix a bug where a spurious capabilities callback is sent." am: 0d4995dcb7 am: 4726fe863c

Change-Id: Ied089ed5ca553b206bdb3f7195f9e623aaabfa00
tree: 3dd5760b7149b2356123f55f58da0089d6517052
  1. core/
  2. services/
  3. tests/