[automerger skipped] Merge "Do no try to unbind when unbound" am: 93d68399...
[automerger skipped] Merge "Do no try to unbind when unbound" am: 93d68399 am: a2be850e am: 59cc3846 -s ours
am skip reason: Change-Id Idbb07c47dca43f3495703f983a7e2710ffa9dbe3 with SHA-1 e0a3cbcf is in history
Change-Id: I71d116d26510f80f74bf6cf6f6a1e2b6ab159985