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