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