Merge \\\"Import translations. DO NOT MERGE\\\" into nyc-dev am: 64d6fddc4b  -s ours am: fde831f55d  -s ours
am: 8f2006ac00  -s ours

Change-Id: Ib343f5df0c040886ef4403ac0bc4afe8de25d9ec