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

Change-Id: Ie1fd61e17f3ed2a1429412722f1571e5c1e91954