am 3f351dd5: Merge change 4555 into donut

Merge commit '3f351dd5dfb705fb0260f1341ce0e257a6ea9f3b'

* commit '3f351dd5dfb705fb0260f1341ce0e257a6ea9f3b':
  Force UTF-8 encoding for SDK files.