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

Change-Id: I6c568b5934268eb8d7d44bd65a59adba4dabd7a7