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

Change-Id: Ie8f871a6a9e0083997497179c669de40996ff165