Merge "Allow using runtest with frameworks-services tests" into nyc-mr1-dev