Fix findId spinning if session id is not found. *** DO NOT MERGE *** am: 8cc90e4d0c
am: 44690bc0ec  -s ours

Change-Id: I53dec753c619c56e9b62c4b73010c704fc07f286