Merge "Don't expect an error on log to proto" into main