Merge "Insulate the account.db from updates." into nyc-dev