Config changes.

Change-Id: I2352f2c375549d15f4896eb228975cc7ab36273c