Restore conf

Change-Id: Ic12b31c1bfaf4ac5955e5b4f8027ab77851db960