Merge "Merge "Merge "Clear calling identity" into oc-mr1-dev am: bc0c5882" into oc-mr1-dev-plus-aosp am: 20a52443"