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

Change-Id: I0886d46f74fec980eb8bd6c99d8b647e294bcb21