Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: 65266b99d2  -s ours
am: f924f2130f  -s ours

Change-Id: Ie9b5a6e2814d4e7f7b7146c677aeed6932c5b11c