Merge change 20484 into donut

* changes:
  BUG 2039647 : support customization from calling wrapper script.