Merge branch 'CR_2102_515_Clocktree_1188m_Xingyu.Wu' into 'jh7110-5.15.y-devel'