re-enable smartmax and ondemand for testing purposes

Change-Id: I7828422dae1d473a16a776fc44486c4ec5b2f4d2