Merge branch 'CR_2661_V4L2_Kevin.xie' into 'jh7110-5.15.y-devel'