Merge "Make setServiceId a TestApi" into pi-dev am: d41e669fca
am: 035b4827ca

Change-Id: I7ab128fb3bf6e09c1e19d43b164acea52949c2ac