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

Change-Id: I8d196f18d64ae8231f6bb41ffdffbe949a0d0cbd