WIP restore cfg

Change-Id: Icbc9a86c1fb3e5f89b0852eaf9720c446d66519a
3 files changed