Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 99b590df3e  -s ours
am: 7b1062da75  -s ours

Change-Id: I64e1747122165a22613ec976e8a3d9d713da41d6