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