Merge change 20326

* changes:
  Fix build.