Snap for 15086948 from 54b4ca383ae2b61edc2372888c5ea45536177ee1 to 26Q2-release

Change-Id: I43cb3d2342f418f202dc6e6b7eab5abe036a8bcd