Merge "Start bringing back legacy storage tests." into qt-dev
am: 4ad49af5f8

Change-Id: Iecece1896f6cc638edfb6b7d4e178545f4eeb6f4