Merge change 4702 into donut

* changes:
  Fix bug 1927213 test failures.