Merge "[debug] Remove BC code from AvroFormatter"