Merge "Import translations. DO NOT MERGE" into nyc-dev am: e303983
-s ours
am: 563969c
-s ours
* commit '563969ccc0e34be7d910f4df2220f01fe25d8ad1':
Import translations. DO NOT MERGE
Change-Id: I749dfd8c6baecc26fc1032288a9df257ac5630db
This commit is contained in: