Merge "First pass at getting Ubuntu working in CI infra"