Merge "Revert "Revert "Add missing null check to String::ToCharArray""" am: f6ebcd099a am: d61fabc16c
am: a2680140ad

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