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

Change-Id: Ia0155fdcebd8c81c24dd68ea345ad4fb40a110d3