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

Change-Id: I81147747c59ec86af0c06acff1b4b95c09725b98