Closes-Bug: 1366924
Storage support added for icehouse

Change-Id: I2be790857c10a91adf98c08365329b6dd74bab54
Merge "Closes-Bug: 1366924 Storage support added for icehouse" into R1.10