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

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