Merge "fastboot: demote OS X USB error." am: 9426110d37
am: eca3e92f04

Change-Id: I9fe0880ded0804d8886bbb5ce85abee8922b5a5d