Merge "Clear calling identity" into oc-mr1-dev
am: bc0c5882c6

Change-Id: I7c2099ce909f1bdfc0a862c4d25257e0f51a0025