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

Change-Id: I28c7df17b56064d5d267de60a0821ebd409b910b