Justin Haaheim
Copy over my latest oss cleanup changes
3459a79