Reverts the iPod ATA error commit and cherry picks upstream fixes from gerrit