[automerger skipped] Only unbind if bind() returned success am: 153e497d60 -s ours
am skip reason: Change-Id I72512f4da276ff5fa1bee2254b42fb938d3a0b20 with SHA-1 178430d3e8 is in history

Change-Id: I5633f81bdafef2344d6dae6dc01007419a79c217