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

* commit '965a2d748de108b5ef9b50f65fe2728f96ee1e04':
  Change to actually remove user/carrier edited entries on delete().