Fix and test the NullStorage driver

Change-Id: Ibc1c744298989d7aa8befcb084d7594ac5aea99b
Merge "Fix and test the NullStorage driver"