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

Change-Id: I731c27e135b2ac59df66301d60615f29b10cf886