Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: 7586c9130c  -s ours
am: bf2ae957ef  -s ours

Change-Id: I517d6df00c1d1782375e66945c0685e00a60b331