Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: cc67847367  -s ours
am: 9fe8474ec7  -s ours

Change-Id: Ia239f70ab7d300e982d12a25c135866fe7f8898c