Merge change 9072 into donut

* changes:
  Make changes to enable driver build in new location