deconfig upgrade

Change-Id: I3cef86b021ae54f2a0b6368c31785eb60c1154cb