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

Change-Id: Iddf470490c3be31666fe5e13776c3e0fb876dcd7