Merge "Clear calling identity before doing any work"
am: 31686e954a

Change-Id: I144fd2b5f46ce7d7a06195a2dd5207d44cd951f0