Merge "Do not use hidden withCleanCallingIdentity"