Can now move back to OSS as all our dependencies are OSS

Source code squash commit import from 0626d39320251d0aac25cff5d24326e33bd53e62