Merge \\\"Fixed check for visible volume.\\\" into nyc-dev am: be0bacda9b am: 2ee81a3211
am: 18ee3e53c8

Change-Id: I4ca401686049e969e6f257b76714e7f3289864c5