Merge "Import translations. DO NOT MERGE am: c300be1cf4  -s ours am: e7aa31539d  -s ours" into nyc-mr2-dev-plus-aosp