Merge "Clear calling identity before calling into UserManager"