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

Change-Id: I89e189d1ff7bd311f05a7c14e264d9f86df5281d