Merge change 8804 into donut

* changes:
  Fix SDK build break caused by including legacy support header into main API header