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

Change-Id: I680e4522081f70e657dfede45f6fbddb1394f31f