Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 06994e5e8c -s ours
* commit '06994e5e8c77fea7f16283590656bceffd9d7c11':
Import translations. DO NOT MERGE
Change-Id: I9f0acc75e5f4300ac1cf3133668531d070b34274
This commit is contained in: