Snap for 11931036 from 38db6d54643a04582cbd6e939a32a0efd304a0be to 24Q3-release

Change-Id: I6009658c6fecf43672c2481b0ba791e49677718c