am affda16a: am 17b2a31a: am 0eb4da60: am 1cb0de17: Merge "Correct the comparison done in removeAdapter." into mnc-dev

* commit 'affda16a7222ce21dd6dccd3059d71cfd4c7eef8':
  Correct the comparison done in removeAdapter.