Snap for 11517367 from 5087b894a3418821e5626f84a6358345909e08ab to 24Q2-release

Change-Id: I65fd33d1f1dd0fca50ab97a8c7ee5c45ea436917