Merge "Merge "Clear calling identity" into oc-mr1-dev am: bc0c5882c6" into oc-mr1-dev-plus-aosp
am: 20a5244345

Change-Id: Ibfd85e6b9d840618f0d9f03d01abe124dd4f746d