Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 125deebf5d  -s ours
am: 3b99360472  -s ours

Change-Id: I3645f4da4f27625faad83dddb191b16a196aeea7