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

Change-Id: I3802f5025e83826f47d674f6d03e78737d8fe8b3