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

Change-Id: If8ade174d66418ecd43606cd57a98655e37deec8