Merge "Merge "Import translations. DO NOT MERGE am: c30efc0214  -s ours am: a40b64efdd  -s ours" into nyc-mr2-dev-plus-aosp am: f65de74901  -s ours"