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

Change-Id: Ic8dcd133449945e7fce8eda9821ef14700e3d276