More watermark work.

Change-Id: I1d20bc1f8679a9750b247126436e8ef7e47a77be
1 file changed