Merge "Import translations. DO NOT MERGE" into nyc-dev am: 917ead578b -s ours
am: 713a057fb6 -s ours
* commit '713a057fb636fecac1a4c55cf75d3b711ba42d87':
Import translations. DO NOT MERGE
Change-Id: I99a05ba0c41004e73e7894b28dfd517708a9bf9e
This commit is contained in: