Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: 3638c9b330  -s ours
am: ffbdc55a1d  -s ours

Change-Id: I6e0abeb5cf3064d95bb562ac8cca5d5b944b6316