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