Merge "Fix prerestore snapshots incorrectly taken with checkpointing enabled." into rvc-dev am: 4a67a4e193

Change-Id: I4d428c3bdf7adab417909a1ad04b237af0fc42e4