Fix handling of storage after decryption

Change-Id: I0c2614f841a225699be9d4a52c60e9456241659b