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

Change-Id: Ie9f46981974a9ec6c55c34c9626c58912f50d4a3