Merge "Add missing null check to String::ToCharArray" am: dc9706dcea
am: 8cbe8c1800

* commit '8cbe8c1800f95b539d002d1810ba610bd05c4819':
  Add missing null check to String::ToCharArray