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