Simplify datastore add/remove account calls.

Change-Id: Id7fda4077547afc8b34fbf6284b5f31830f21bd5