Snap for 14820049 from 60350a23e8b8f5f8d19be1eb489080e9eb9d1e71 to 26Q2-release Change-Id: I3d9e28b12071ec9b1224acc73b2f30672df891fa