Better handling of deletions of accounts

Bug: 6141367
Change-Id: If212a91e772a48717ac77326cd6ea1f1ad5ebfa5
2 files changed