am a8c06116: Merge "Remove remnants of HWC 0.x"

* commit 'a8c061169752cbaf335a35e49568b7fe7d7e83cd':
  Remove remnants of HWC 0.x