Fixing restore flag not getting persisted
am: a7962a4d99

Change-Id: Ic085b34110711b9920b39c85815bb468296f54f1