Merge "Skeleton code for user dictionary sync"