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