Merge "Support shouldTestUApis"