Merge "Only unbind if bind() returned success" am: 6035e5b14f am: 1df101d3c3

Change-Id: Id8b10b6da837c46b99d942ed1bbfe972cee07626