Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: 972b902171  -s ours
am: 2729e09857  -s ours

Change-Id: Ib183bb161904472854fb6a4ae65943329d5c21a6