Merge "[automerger skipped] Merge "Make setServiceId a TestApi" am: bd6bf7cb am: d07eb64e -s ours am: c8d479f1 -s ours"