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

Change-Id: I0071654ea2d70605ea858e19454621f97fd92f28