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

Change-Id: I13908cbf3a74b215e12c271642722424470e30c6