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