Merge "Merge "Delete account from DE and CE databases" into nyc-dev am: a087d7f4fa am: 93f4735f2f" into nyc-mr1-dev-plus-aosp
am: c346a2d872

* commit 'c346a2d8724c0965c5a037c1f0940087430776a4':

Change-Id: Ic546c4183b037160017b32717a69a1ef1be030c7