Merge "use test_current for CtsAppTestStubs" into nyc-dev