[automerger skipped] Merge "Catch exception when unbinding" am: 814d22e1 am:...
[automerger skipped] Merge "Catch exception when unbinding" am: 814d22e1 am: 905c2bcf -s ours am: 94dd4fda -s ours
am skip reason: Change-Id I2d9d5f02f5123eb6658272bc5f53bb53906d5be6 with SHA-1 4ae0c18a is in history
Change-Id: I4c49dbc1941bc578cd72a1a250e5ab9dbd925d68