Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: f91526c8e5  -s ours
am: 49c4860904  -s ours

* commit '49c48609048dbd2fc3210560272949345bdd437c':
  Import translations. DO NOT MERGE

Change-Id: I60f81c3099a12e5e57edee1c4ed625d0749b4c18