Merge "Implement service filtering" into oc-dev am: 35110948b7
am: 48a2f0036c

Change-Id: I479a1db354a7f61e669f67241a0648d843301e95