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

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