Snap for 14295020 from 3022fee2b2692c48e9ae5d55f3f3a4bbd7b0e237 to 26Q2-release Change-Id: Ifd327d8050f089704b9e28da71ab3459ca0c0512