Merge "Import translations. DO NOT MERGE" into nyc-dev am: d5f7c20a26
-s ours am: 4422014feb
-s ours
am: 3bef07780b
-s ours
* commit '3bef07780b92550bc7e5c4975ef4c0bcf91d9a72':
Change-Id: I4ac03c679a57638aacb18a69c82749c7b1ae1ac4
This commit is contained in: