Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: 4001aeb858  -s ours
am: a51b8e0bb7  -s ours

Change-Id: I7ab5526211942ebef5934df8cd08541861c994bd