Merge "Remove explicit dependencies on core library"