Merge "Don't call .toString() on potentially null CharSequence" into nyc-dev