Merge "Add VIService ST module selection TestApis"