Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: f91526c8e5  -s ours

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

Change-Id: I44df018d7af6c1f943c46b521d2917e01d86f128