Kernel/power backports from CAF 3.4