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

Change-Id: Ib6dc5518fe103151b2a0ce47f2702246228dff78