Merge "Update QueueBufferOutput."