Merge "Import translations. DO NOT MERGE" into nyc-dev am: 5854f2aa07  -s ours
am: e53394400c  -s ours

* commit 'e53394400c1a3eba6cc061de57b2e2cf16faddaa':
  Import translations. DO NOT MERGE

Change-Id: I6e589440817760fb646979e95fd3404ae31b98a1