Merge \\"Check for valid paths when getVolumeList() returns invisible volumes.\\" into nyc-dev am: 6da2fb61ce
am: 1f160df10d

Change-Id: Ie518b4d9522da4384fd56436b888a1f4d1738a13