My flight is a two legged affair. First leg BA, second leg AA (ran as a BA flight). BA have informed me that their international rules and regulations hold for both flights, so the BA rules override the AA ones. Luckily the BA ones are that the cylinder just be empty, the valve can stay on.