Remove IP address from shared storage device name

Change-Id: Ic930ae2666198beb32db853f797ac3472188327c
Merge commit '41789310b6645dac50e0f3463d252f3d7d677ca4'