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

Change-Id: I91a051f07c4ea6bb6b66c98d82a51a9ca20da722