Merge "Import translations. DO NOT MERGE" into nyc-dev am: 7fa7ad595f  -s ours am: e12e17fcdb  -s ours
am: 20594ccf60  -s ours

* commit '20594ccf6003124658b15fda73a2f91d5b373cbd':

Change-Id: I2c4c061004377d493fbd3a99273543dcfaed63d6