DO NOT MERGE Ignore clear config if shutdown
am: 36604547f4

Change-Id: I622636165d096b17c284496f32fa2127a9fcbfd8