Merge "Import translations. DO NOT MERGE" into nyc-dev am: dad7b893b2
-s ours am: 08f2eaf5ae
-s ours
am: f99299b24e
-s ours
* commit 'f99299b24efa2f8aa062e5b3fa41d61af6131e78':
Import translations. DO NOT MERGE
Change-Id: I293e15cb92eaab5ab6ecbb61141ec3c7187dbf1a
This commit is contained in: