Merge "Adjust ACSD APIs" into sc-dev