Fix for storage net

Change-Id: I3fdd8e28787ef731d4286f8af1ceb834373c578a
Closes-Bug: #1273140
Merge "Fix for storage net"