Snap for 13264465 from c08ece9fa74ba04e49f7aac422f452c48a701c0a to 25Q2-release

Change-Id: Idbbe40f3dd71e319637fb416afeacbb33a4bd5e6