Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: f315e2e6f0  -s ours
am: 672e1ddb14  -s ours

Change-Id: Ia75f957c8348a0562d7941220b8a796fe57d363d