Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am: 81c6e4b4e0  -s ours

Change-Id: I512a428809562ba7ba6d3c0e4789051fec031c4a