Merge "Change to actually remove user/carrier edited entries on delete()." into mnc-dev