Merge change 2138 into donut

* changes:
  Add padding to public.xml to avoid breaking from auto-merges.