Update Config

Change-Id: Ie9ea2d3d13d468d4fe5c874fb65376025af5984d