Merge "Switch APCT Perf test to JUnit 4.11 friendly"