Merge remote-tracking branch 'upstream/nightlies' into sm-4.4
Version 43

* Fix a couple bugs
* Add back Ondemand to the governor choices

Signed-off-by: kecinzer <kecinzer@gmail.com>