Merge "Add SDC dependency fixes"