Merge "Do not try to unbind if not connected" am: 06b25f4cab am: c9471df25b

Change-Id: I62785bd28972b6fbb394bd72c2b00a388ca015ea