amazon-fireos related changes.