Patch for inconsistent pair-unpair state

Change-Id: I356cd978c6b30b415a94267c9e535dc0297d6540
1 file changed