storage config: lets do it the google way

Change-Id: Id6131fe01d61f31ff89a6a1f69ee7cd027745df8