Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: 285c920428  -s ours
am: 09e2617bd4  -s ours

Change-Id: If3359d2d4a78d3db6d439e488586ac15e86cd78f