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

Change-Id: Ia217a988e8816741bca4a04ba2a27c7e09eaf249