Merge "Correct the comparison done in removeAdapter." into mnc-dev