Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: e1add91fa1  -s ours am: f0ed05f4b7  -s ours" into nyc-mr2-dev-plus-aosp