Merge "Switch to ucp 3.7.24 mosk base image 25.2"