Closes-Bug: #1334895
Support for global storage config

Change-Id: I7e03f088c4315730f0af9cb50d0ec3662db88439