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

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