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

Change-Id: I42a340d4bcdb0437ee36f2adb586db7c04626d34