Merge "NullPointerException handling, connectObexSession"
am: e96ed26186

Change-Id: Id61abd82383015938d58487b3604b3d573520b09