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

Change-Id: Iedb8a217643556d0f4920d3f076daa65bf3def73