Merge "Re-enable running of SingleFeaturesTest"