kumquat: storage changes for JB

Change-Id: I2ad94eaae57dcb0bc2d16ce4e75b317d535aecaa