I don’t know about the Hibiki 17 but I managed to buy 4 bottles of the Hibiki 21 Kacho Fugetsu at Narita over a bunch of trips in 2019 alone. The little Fa So La (I think) shop between the JAL Sakura lounge and gate 61 usually had something and when they didn’t, I’d ask and there was often something in back. They took the good whiskey out of the display at some point and filled it with gin and schochu I think.