Merge "Remove redundant installInfra call from installOssInfra"