Find7: Unified storage partitions

Change-Id: I307108f40fecc1a13adb96e6497760d036c4b32e