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

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

Change-Id: I7ffcfce55ed4c38bf82802a7724f8952b5f1bb60