Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 442628a226
-s ours
* commit '442628a22693286cc1f96e1b1fbd8743f9eedea7':
Import translations. DO NOT MERGE
Change-Id: I63a36d6c9a94f27f75adfdc84d2920c55fba2f33
This commit is contained in: