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

Change-Id: I5b1aa0be01603cfaa09e3dfaa774182f6a62c188