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