Merge "sdm: make the control partial update call synchronous"