Merge \\\"Import translations. DO NOT MERGE\\\" into nyc-dev am: 7ce75172dd  -s ours am: 31e9b4c8c7  -s ours
am: 71556ef0e4  -s ours

Change-Id: Ibfe82d158a295eeab838a8271ce631f712205fd1