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

Change-Id: I5fec32a2824d652c96c7c2b9bb0db46c170bffa9