Snap for 12695596 from 4172785427289db0804f06dd13176b52bd35451a to 25Q1-release

Change-Id: Id8a48258cd5ebd187801f3a7f23c19da38d80637