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

Change-Id: Ib09d545a5ad307e82c04136c57c10fc33eddce48