Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 0705a5136e  -s ours am: f745ac7a08  -s ours" into nyc-mr1-dev-plus-aosp
am: 866640f259  -s ours

* commit '866640f259455c2f0b910fba902ab660030e9230':
  Import translations. DO NOT MERGE

Change-Id: Ie5857beb035af107d4a0173ee4fefef2ea3b86f3