Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: cfbb3c81b1  -s ours
am: 630dee082d  -s ours

Change-Id: Id6648b033d4f3dfa5853c2d4938b26056b42a6ff