Closes-Bug: 1366924
Storage support added for icehouse

Change-Id: I0b8ba78c618066af34d92677dd9946c11c604e4a
Merge "Closes-Bug: 1366924 Storage support added for icehouse"