Merge change 23569 into donut

* changes:
  Update 4.xml to the most recent APIs.