Snap for 14882176 from 80290a9aefa0663f37a764764c9765d6421a94eb to 26Q2-release Change-Id: I1ba869410c1701da23d47cb3b92fa6b1663b5398