Merge change 5054 into donut

* changes:
  Rollback the number of loop in the memory stress test