Provision watch refactoring

Change-Id: I357de534bfe5166fc2c285643c4e755e876c1c3e
Merge "Provision watch refactoring"