Merge "Clear calling identity before calling mountService" into nyc-dev