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

Change-Id: Ic152eac3a92179537cb18ce715c500a96d376923