Merge change 22650 into eclair

* changes:
  Fix build break - Introduced in 22109