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