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

Change-Id: I9a01ac7789ba1cd8568ed286aa4e22676ae381b1