cleanup preserve data/media workaround

Change-Id: I634c9229368c6c8ea20cafb47c8c0403cae2be6c