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

Change-Id: I920bd6e3739bf4fe103e5ba8fd26d2a0c10e52b0