Merge "add more tracing for buffer allocation"