Merge "Insulate the account.db from updates." into nyc-dev
am: 4ba55dc462

* commit '4ba55dc462b4e43086bef24b064d069df27e7670':
  Insulate the account.db from updates.

Change-Id: Idd9fbfd18cb893f89b68a177033bfa921397ade2