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