Merge "Update {set,get}{Long,Short}SupportMessage APIs to use CharSequence." into nyc-dev