Merge "APV: Update CSD according to the latest spec change" into main