Merge "Remove dependencies provided by odlsli base image"