Merge "Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: e573989e05  -s ours am: 5b96cafec8  -s ours" into nyc-mr1-dev-plus-aosp