Merge "[automerger skipped] Merge "Allow filtering of services" into sc-dev...

Merge "[automerger skipped] Merge "Allow filtering of services" into sc-dev am: 5a9b55cf -s ours am: 7cf0e720 -s ours am: 9b6315ce -s ours am: b5851039 -s ours am: bd59cd44 -s ours am: 7ab4fb2c -s ours am: afa0a772 -s ours am: fc10ca01 -s ours am: 9fa9e771 -s ours"