zen-tune: add back down sampling factor to ondemand to improve throughput
Merge branch '3.12/zen-tune' into 3.12/master
Merge remote-tracking branch 'damentz/3.12/master' into 3.12/my