[PATCH 0/6] Start of skl watermark cleanup