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