Merge change 5990 into donut

* changes:
  Pull 138592-p9 from master to donut.