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