Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: d8a450557e -s ours
* commit 'd8a450557eadb7869cdf7a9a69dec30c85828406':
Import translations. DO NOT MERGE
Change-Id: I56f1f226de2d4631b76c5b343d27e3e8b76c4a11
This commit is contained in: