Merge change 21047

* changes:
  Fix build break.