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

Change-Id: Ic39f504b2dd5931efdc00025c79dc79bda3acd00