Change-Id: I1f7090d22c33891717002297c898cf1b5ddb210c Partially-Implements: blueprint remove-docker-dir