hammerhead: Updates for recent PM changes

Change-Id: I94ebd3376c990879cd6ca0a140ff8c102b567acb

Signed-off-by: flar2 <asegaert@gmail.com>
Signed-off-by: revjunkie <gadgetjuan@gmail.com>