Merge \\"Fixed check for visible volume.\\" into nyc-dev am: be0bacda9b
am: 3ff43c5f0c

Change-Id: Ic3d775023e5d3de14a59b5a59d546630e21163fc