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

Change-Id: I16ea6b1c11cde1b9491826d7e95dc9bf3a45458b