Merge "Refactor adjust channels buffer provider."