Merge "Import translations. DO NOT MERGE" into nyc-dev am: a62d335d5b  -s ours
am: 5a10418bf0  -s ours

* commit '5a10418bf0ad7d1e0f21f3096a9ac16bb7cbddd5':
  Import translations. DO NOT MERGE

Change-Id: I2f3a246a58d927755004791af59c56404ff890b2