Merge "Restore DE_sys snapshot when rollback APEX is activated."
am: e1f8400758

Change-Id: I8e048408edb640346f618ebe4d181769e6998385