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

* commit '4c7fd9459e1a38ff913be67b6e4331bd23ab8b37':
  Import translations. DO NOT MERGE

Change-Id: I9df28de27582c061165d5156952481bdb98d9490