Merge "Fix a few indent format issues in buffer defs"