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

Change-Id: Ibcbc5fd8cacf53e2bcafc93f1ddbeae3f0475ac4