Snap for 11784291 from 3d6bca2745a94f88bf74eb4bbd2288463570a9fb to 24Q3-release

Change-Id: I5603aa4ac42bbead7c052876630e4e1100bd9150