Merge "Test that uid 0 isn't dropped in proto to text conversion." into main