Snap for 15086948 from 14d1d8f18b12fe4cdfd946e00b9f0f9e1a774646 to 26Q2-release Change-Id: I086de25c51a021ac7a1fddc39ff565dd6cb72b48