Merge branch 'CR_1875_5.15_evb_vout_shengyang.chen' into 'jh7110-5.15.y-devel'