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

Change-Id: Ic2fbd49a5b17d6f4a56f0365ff0bfb5e027cec01