Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: bb07b0b372  -s ours
am: 847dcc9f4e  -s ours

Change-Id: I940c75e30425862896c1727b4717388f7bdacbd8