Merge "Flag guard when we call into InstallDependencyHelper" into main