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

Change-Id: Iacb267f7fb77bc555cbd537df6471f0b9c7a0007