Merge "unhide getId from BeginGetCredentialOption for jetpack"