Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 2e032b7463 -s ours
* commit '2e032b7463bef48b88cd18f2c5b8501a0d80b9ce':
Import translations. DO NOT MERGE
Change-Id: Ia90dbc3d86b317621b525665a9817cd41b8d497f
This commit is contained in: