Merge "clear calling identity before calling getUserInfo" into nyc-dev