Snap for 14593600 from 8fa7072bef2df8acae8a4cc276e3467419b1a6fb to 26Q2-release Change-Id: Ibedeb56a78796cafe125456e843c445ceb2027ac