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

* commit '1cb0de17a9a4de137247f7bf69ec44a83e30efa2':
  Correct the comparison done in removeAdapter.