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

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