Snap for 13190096 from 9cea917cc2359e6b5b514defedabb274ea180cf4 to 25Q2-release

Change-Id: I8ce68c3eed9f63fb41764cae11fe9aebb6b1635c