Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 6201ee5c68  -s ours
am: 5aa8230eb4  -s ours

Change-Id: I9f0c210dc6dfeb8bc60f924309199e50a5e99838