Merge "Clear calling identity" into nyc-mr1-dev