Hi there. I flew this flight 2 weeks ago. Its on the A380. They indeed handed out amenity kits in J & F.
PS: Was a horrid flight with turbulence that day though as we flew through that tropical storm over Africa at the time so service was suspended for a majority of the flight but expect that doesn't often happen.