Merge "Import translations. DO NOT MERGE am: aa29f638f6  -s ours" into nyc-mr1-dev-plus-aosp