Merge "Use [clear|restore]CallingIdentity instead of withCleanCallingIdentity"