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

Change-Id: I9bf852b6f99959a8bd9f50395115c5d1c4b0850e