Merge "Revise SDK version for CBSClient updates"