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

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

Change-Id: I7242f7f064f6695956a9b529f38c2ece82effbcb