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

Change-Id: Ie19ae7075e8fe35857a60306452fe19b06bb1848