Added hook presence sanity checks

Change-Id: I0389dd61ca8324d6bf08647fbdf6464c07b15df0
Merge "Added hook presence sanity checks"