Merge "Clear calling identity before getting the current user." into mnc-dev