Merge "fastboot: demote OS X USB error."