Merge "Import translations. DO NOT MERGE" into nyc-dev am: 93f97c07f6  -s ours am: 5f0e629a64  -s ours
am: 1b39859105  -s ours

* commit '1b3985910548d8cf99ec2c489b26ce1765c6619d':

Change-Id: Id82e0d54e8503f8496070de61ce5ebd3df4cdb7f