Merge branch 'CR_2861_ts_515_changhuang.liang' into 'jh7110-5.15.y-devel'