Merge \\\"Import translations. DO NOT MERGE\\\" into nyc-dev am: bb07b0b372  -s ours am: 791de14f4c  -s ours
am: 2a99d01323  -s ours

Change-Id: Ib651481c44029ee84fc43004a4b8d958424369c1