Merge "Make setServiceId a TestApi"
am: bd6bf7cbe8

Change-Id: I5d95289427ea76d1011c6ba4365e55b312a89be5