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

Change-Id: I3a940e1fb84bc04b7b53cbe25111768deb3e6d0c