Closes-Bug: 1366924
Storage support added for icehouse

Change-Id: I4e1a2b2f3386efc37dd940ee69ea38f6859ebc24