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

Change-Id: Ia4640233c55faaa79050d94e71d48c5301be2904