Snap for 15012624 from ffc22420f47fd0e60f59ee4d7264df8a4b70e425 to 26Q2-release Change-Id: Ia54633024ef190751c4ee5cc1e52cc8e9dd3d42b