Storage configuration options (1/2)

Change-Id: I1dbd1161230ad1d48440c6c3a29841c5c486a905