Merge \\\"Import translations. DO NOT MERGE\\\" into nyc-dev am: bb8b32262f  -s ours am: 2ff4926362  -s ours
am: 6b0ffbfbd0  -s ours

Change-Id: If7ae4bb8accfe8151620dbe62ca08a61fbc558fd