Merge "[automerger skipped] Merge "Make setServiceId a TestApi" am: bd6bf7cbe8 am: d07eb64e09  -s ours am: c8d479f12e  -s ours"