Merge "Fix a bug where a spurious capabilities callback is sent." into rvc-dev am: acdacbfe65

Change-Id: I47f8f49d7e51ebaec68e7ad678f55fd0087847c7
tree: fa754b8cb1062a743d3467cff8fc1ff37205ae28
  1. core/
  2. services/
  3. tests/