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

Change-Id: I2dae41adca3d215300e88c449f18a647621b57f3