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

Change-Id: Ifbbfe203c4ee57bdfbf8cb01d504abc2e89741a6