Merge "Track move of distro installer code"