Merge "mw.ForeignStructuredUpload: Rearrange messages to always display license name"