Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am: 20088b3e31  -s ours

Change-Id: I436ace11c8559ba3c4dd4db8314e12455a1075a3