Merge "Merge \"Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: 65266b99d2  -s ours\" into nyc-mr1-dev am: 74ab23803c  -s ours" into nyc-mr1-dev-plus-aosp