hammerhead: switch back to ondemand till slim govenour is back

want to tweak it before we use it on lp again.

Change-Id: I8960ec7a7e25aea5954669df19719d65b031ab2b
Merge remote-tracking branch 'slim/lp5.0' into lp