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

* commit '17b2a31a1be62b7f7e0c9442a2fec5f96d828e67':
  Correct the comparison done in removeAdapter.