Merge "Remove extra LocalCallingIdentity creation" into mainline-prod