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