Merge "Revert "Add missing null check to String::ToCharArray"" am: 6aa0735c7b am: 59a32943da
am: 7b72b04c49

* commit '7b72b04c499b1e1f3ea1b2c5f766015331b23d3b':
  Revert "Add missing null check to String::ToCharArray"