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

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