Merge "Move more fields to InstallSource."