tamird Merge pull request #16894 from tamird/remove-snappy-junk …