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

Change-Id: I40b3ca138f9514314b94a4748ebbbbc74bf848e5