config changes

Change-Id: Ic37fe28b61f6c5d446d749408e1bd2c28f2be528