Merge "Fix findId spinning if session id is not found. *** DO NOT MERGE ***" into nyc-mr2-dev