Merge "mw.ForeignStructuredUpload.BookletLayout: Remove incorrect comment"