Merge "Import translations. DO NOT MERGE" into nyc-dev am: d28707d9f1  -s ours
am: 156979ec3e  -s ours

* commit '156979ec3e49f133eb6081719ff7a1d3fa0db067':
  Import translations. DO NOT MERGE

Change-Id: I0851c14e757e98765921cd59658b7f9cb5cc7a63