am d2edad8b: am ee77c74f: am c82d63c2: Merge "Replace Maps with UserDictionarySettings to trigger database writes"

* commit 'd2edad8bdff5b288293dccbc1c13826ec4e7c1bb':
  Replace Maps with UserDictionarySettings to trigger database writes