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

Change-Id: Id71bc5054fb8df28f0402757bf469e357e382b11