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

* commit 'f7166bd1c89101a8eaecb5a00829be267030013e':

Change-Id: I30a2a7e612e02f47b479c7efdcef914ba229da31