Upleveled amazon-fireos changes.