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