am 5d11ec46: Merge "Update the AOSP dictionaries for the 0-freq review" into jb-mr1-dev

* commit '5d11ec461387e45a208c53182628be6dfbd0d8e1':
  Update the AOSP dictionaries for the 0-freq review