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