Merge "Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: bb07b0b372  -s ours am: 847dcc9f4e  -s ours" into nyc-mr1-dev-plus-aosp