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

Change-Id: Ia3d8d98b07f606740644edf3b02f69be93d18a68