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

Change-Id: Iff2c7db85ae73278ed3798de72e518a25f1e7887