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

Change-Id: Iea98f671098db9643b2f91bd2c28619e8a317d68