Snap for 11987757 from d0c94b832dfb3062bf15d9baaf64123fc670b06c to 24Q4-release

Change-Id: Icedf688118fca8c8ac32d95140f80204e381d938