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