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