Snap for 11987757 from 9f56fe8374c22a6c39f3d95713404ac29b78276a to 24Q4-release

Change-Id: I4670d7a5c6d6725321d4b3369ef83a940b778d02