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