Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: 2bc13bcdad  -s ours
am: 3e9917dc91  -s ours

Change-Id: I10946d0fa4e33dfedb60c9f3a37318fd4adbd991