Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 8c228d05e3 -s ours
* commit '8c228d05e3b050c82a3e7bd69799d6dafad5e0e9':
Import translations. DO NOT MERGE
Change-Id: Id4d7363ff2a4d43388f8c8bb2b6e117cee373a66
This commit is contained in: