ck-3.15: fix the high power usage bug
Merge branch 'ck-3.15' into pf-3.15