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

Change-Id: I638873a702599a87476abd1ef92734099dca3c76