Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 12d1f5d5c0  -s ours
am: 774f4e43c5  -s ours

* commit '774f4e43c5c170d377be22d4181e4466504323f3':
  Import translations. DO NOT MERGE

Change-Id: Icc668bbb228ff5d2fb6b3b6bf5cf24eeb3703db1