Merge "Don\'t call .toString() on potentially null CharSequence" into nyc-dev am: b182735757
am: 7317034daf

* commit '7317034daf526553ef3ad7052d994b17820fd9e3':
  Don't call .toString() on potentially null CharSequence

Change-Id: I7a9bea266fa3748e212384165623acc561fa2a81