upstream merge; interactive: removed hispeed_freq; ondemand and performance gov disabled