am d65800a0: Merge "Import scsi headers"

* commit 'd65800a04b40146ae8591f723da1b6871b9ecc0e':
  Import scsi headers