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

Change-Id: Ie4030627ad6d4961f4479ee48b3efddcd828ae56