am 848b54ae: Merge "Support MMS with empty subject"

* commit '848b54ae56cb8fa8264f65365db65dc7f1921f81':
  Support MMS with empty subject