Merge "Fix bug where constructing message attachment uri with null/empty partId will remove the trailing backslash, causing the uri to not match the expected pattern." into jb-ub-mail-ur9