Merge "Revert "Add MTS suite config"" into mainline-prod