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