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