ec272b8fe4
Partially-Implements: blueprint remove-config-internal Change-Id: Ic6b7cb217a126c53c0055dbcac4d345583599eb1