Fix some incorrect hook annotations

Change-Id: I2594b50c07eafbee68df29152066c81a79035a9e
Merge "Fix some incorrect hook annotations"