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

Change-Id: Icf52bab9a22de5f71dbf4ab376e77e1a8c2a5027