Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 4a1e89ba44  -s ours
am: 725be4160c  -s ours

Change-Id: Ib89566c31f208fc2c0e369f3137dd6057e5948f0