am ee77c74f: am c82d63c2: Merge "Replace Maps with UserDictionarySettings to...
am ee77c74f: am c82d63c2: Merge "Replace Maps with UserDictionarySettings to trigger database writes"
* commit 'ee77c74f':
Replace Maps with UserDictionarySettings to trigger database writes