Storage configuration options (2/2)

Change-Id: Ie487323edce58f174b4956a2e832ac4c121309ef