Merge change 4555 into donut

* changes:
  Force UTF-8 encoding for SDK files.