Merge changes from topic "am-135190fb80e84a5ab722798ba75fc2ed" into udc-dev

* changes:
  [automerger skipped] Merge "Allow filtering of services" into rvc-dev am: 9fa25877 -s ours am: 47a0fdbe -s ours am: 39043e38 -s ours am: 78e1c844 -s ours am: 5b2621ce -s ours am: 2f486516 -s ours am: 72cba2a4 -s ours
  [automerger skipped] Allow filtering of services am: 44dcb835 -s ours am: ec28f4a4 -s ours am: ef9e7715 -s ours am: 74f4f24e -s ours am: 86190e8b -s ours am: e486df46 -s ours am: c4c1cb4c -s ours