Merge change 24759

* changes:
  Comment out debugging output.