Merge "Clean up initWithBufferTraits"