Merge "Make setServiceId a TestApi" into pi-dev