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

Change-Id: I6b2582eae6f57da808d5ee162023f5fe1b3226d6