Merge branch 'pm-clk' into pm-runtime