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

* commit '59a32943da3eeb76968f7d6817b031f95a7dc6a3':
  Revert "Add missing null check to String::ToCharArray"