Merge "Add new APIs for watermarking"