Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: 2edb44c33b  -s ours
am: fa1de68f0b  -s ours

Change-Id: Ida7e339c71d61479d813186d7f57734e8730f520