Merge "Turn on DepAnn for test-base and test-runner"