Merge "Replace withCleanCallingIdentity with [clear|restore]CallingIdentity"