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

Change-Id: I5894a3e637e0150df1117ab1959154afe58c024c