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

Change-Id: I54add5944e6e9e67f9b227db8e4f290003ac4990