Merge "Use local buffer for AdjustChannelNonDestructiveBufferProvider."