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

* changes:
  [automerger skipped] Merge "Allow filtering of services" into rvc-dev am: 9fa258770e -s ours am: 47a0fdbe46 -s ours am: 39043e3884 -s ours am: 78e1c84460 -s ours am: 5b2621ce46 -s ours am: 2f48651667 -s ours am: 72cba2a4aa -s ours
  [automerger skipped] Allow filtering of services am: 44dcb8351e -s ours am: ec28f4a497 -s ours am: ef9e7715cb -s ours am: 74f4f24ea8 -s ours am: 86190e8b6e -s ours am: e486df46a6 -s ours am: c4c1cb4c67 -s ours