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

Change-Id: I25f83a3ef505174745cd6196996de93ed6da9bd3