BFN
Fix autogeneration of watermarks on upload.

Bug: 12634