am 94f1925d: (-s ours) am fa98633e: am 240383fd: Merge "Update the dictionaries" into jb-mr1.1-dev

* commit '94f1925d5e3f21aedc3a60b48d2c5289446e7fdf':
  Update the dictionaries