Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: 7b1931674d  -s ours
am: b15fd7eaf2  -s ours

Change-Id: I972f0ec23300448520eef24ceaa42514e5ffc4e2