handle removal of self added configurations

Change-Id: Ib2891ac38a4a876b0cd4f198cf26198b9fc12909
(cherry picked from commit 23fea6a042073e3cb1b0e74be5b0d096916ab6b8)
1 file changed