Merge change 8877 into donut

* changes:
  Remove warning in non-eng builds.