Update Ondemand

Based on many patches by stratosk

Change-Id: I9e331d333f4c2a4470a068766c8f0741cb75cdb7