Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: 98e71028c7  -s ours
am: 059a43818b  -s ours

Change-Id: If3625bb70715da68be16a42bdc8116965039e0a0