am 6d23923a: am d65800a0: Merge "Import scsi headers"

* commit '6d23923aa76ce5004f85425f7d85fc0ce4020f01':
  Import scsi headers