Merge "Copy DatabaseUtils from SettingsGoogle to Settings and use the new Settings database."