Merge "Fix AccountsDb update."