am 743b376b: Merge change 8804 into donut

Merge commit '743b376b363f85b6109828e5c33857316d263468'

* commit '743b376b363f85b6109828e5c33857316d263468':
  Fix SDK build break caused by including legacy support header into main API header