Merge "update the SDC client APIs" into casablanca