Snap for 14820049 from df43aa091dad3c5aba229c9178ca3574dd0ca8ae to 26Q2-release Change-Id: I476cb8d35f35945fa0bf8778b4263cf21057a0f4