Merge "Import translations. DO NOT MERGE" into nyc-dev am: 2b92ce7aaa  -s ours
am: 0118fbd3ef  -s ours

* commit '0118fbd3ef557461ab4725a06eb9064d622cf88f':
  Import translations. DO NOT MERGE

Change-Id: Icf798098101b876a050d56dedfb417e27b742971