Merge "Clear calling identity" into nyc-mr1-dev
am: 072abeac57

Change-Id: I1250872bec1a71480c464d92960fb92d46c9a13f