Snap for 14962154 from 2b4dfadf1608bf01b360726bf0aeebf53ed82ee3 to 26Q2-release Change-Id: Ic6fdcb2013dd872d1964614d15a155fc6252008a