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

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