Closes-Bug: 1366924
Storage support added for icehouse

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