Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: dbfd3a837e  -s ours
am: 2e07e8a9dd  -s ours

Change-Id: I1ae5f291b3abd72eff7155007c442ccd6b64bb2d