smartmax & ondemand update, killing lag

Change-Id: I1eb31c3e28cbdd0cd3bb5ead0a47334c863921cd