Merge "DO NOT MERGE Clear calling identity before checking if user is running." into nyc-dev
am: 2df7f9f9c0

Change-Id: I9ca23aa395e0120413a60174e9b7ef44d91a90b1