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