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

Change-Id: If508f6fd2dfdf0f3c8bc6f7f68f8aca684580e5a