Snap for 14371165 from d4907273f74704014e2c09b52afa5a87a9600c90 to 26Q2-release

Change-Id: I19b615350319a83db669d10eb50253e864fdf642