Merge "Handle the case where no session exists" into oc-dev
am: 261dd2305a

Change-Id: I36b6b77759b8bbfbccfd0801daccb8d4e0137a77