Change-Id: If5e100ddf5eda6a484d2eeb4c6adb9ee588d9b92
Partially-Implements: blueprint remove-internal-config