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

Change-Id: I8d1b3272011f76fe78c590ace5913e7131b9efce