Fix findId spinning if session id is not found. *** DO NOT MERGE ***
am: 8cc90e4d0c

Change-Id: Ide2eaebf378d48874d6f88dc7ebd84b6e36678d1