Merge "Update the VD and AVD's getOpacity()" into nyc-dev