Closes-Bug: 1366924
Storage support added for icehouse

Change-Id: I11fd9186bef9eead272fee6335f4a04adacc7008