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