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

* commit '68c1a0cdbb291688b9c3447541793346d688b65c':
  Add missing null check to String::ToCharArray