Merge branch 'CR_2621_CPUIDLE_mason.huo' into 'jh7110-5.15.y-devel'