Merge "Import translations. DO NOT MERGE" into nyc-dev am: ada5c5f12f  -s ours
am: 46f9215c7e  -s ours

* commit '46f9215c7e050036868efa658cfd19590579fdd7':
  Import translations. DO NOT MERGE

Change-Id: I95b4a665381d803aa326a413bee483bfd51d5081