Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 7b6dd72c56  -s ours
am: 584caf46df  -s ours

* commit '584caf46df1a4cf52e270c2449796c4962d451a9':
  Import translations. DO NOT MERGE

Change-Id: I2cc71847d290aa7ac8c2cd35ea88ff22200cc354