Merge "[Coverage] Fix coverage bug in which extra garbage is being written" into main