Merge "DO NOT MERGE Clear calling identity before checking if user is running." into nyc-dev am: 2df7f9f9c0 am: c5d86736d3 am: 00b77edec0 am: 11c5ff0399 am: d49386eaa5
am: 9b9158f9f9  -s ours

Change-Id: I71c292d901150c4328a1ae79df7e499cfdd52465