Merge "Extracted persistence logic into AccountsDbUtils"