Merge "Move NEM and friends over to LogBuffer"