Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: 6b760508d0  -s ours
am: e635b37a46  -s ours

Change-Id: I6c478714a34da09b2ab7793e0f4f70568db5f9c1