Merge "Import translations. DO NOT MERGE" into nyc-dev am: ae284e6cb6 -s ours
am: f3dfa54f79 -s ours
* commit 'f3dfa54f79a994e002b2133a4f1029fa37d0cef9':
Import translations. DO NOT MERGE
Change-Id: I6a83cc15114c3e7c37980f74bcad0b69eb233b3f
This commit is contained in: