Bug 1022585 - Support cleaning up storage on Flame. r=wlachance