Merge "Update setBuffer for SCC changes."