Merge "Update to latest SDNC and CCSDK containers"