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

Change-Id: Ia493eb31e34afb151c5b96984f101a55ddd80e08