Merge "Allow apexd to snapshot and restore DE data." am: 0460f65f78

Change-Id: I5e33934de587c18d9ccdb0734c0ea1ca58d2016e