Merge "Remove unneeded dependecy on core-tests to fix build"