Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: a9a03b5d7e  -s ours
am: 71731a6d1a  -s ours

Change-Id: Ic2b521dc5a8f71bbdac12777253975fd4fdd3cce