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

Change-Id: I30eede8a0a084b61746033444487e991b20c94f5