Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: 28cb163056  -s ours
am: d6803f7eec  -s ours

Change-Id: If851a2131087c8a2199dc51f0ba4a8bce75fcc92