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