Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: 44c39e709b  -s ours
am: c802ded395  -s ours

Change-Id: I851263f1c1f78bb3b4b8ccf56e5fff7b3da89886