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

Change-Id: I412d623de4ae2c32e0070bcb105010c234fe56b7