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

Change-Id: Ibcecebeb1286ecbc1529b428028a75c5b01de436