Merge "Make setServiceId a TestApi"