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

Change-Id: Ibcce9df3461b1a73998c7ab69790767b902f19db