Merge change 23762 into donut

* changes:
  Add updated API diff based on 4.xml.