Merge "Make futures-channel available to product and vendor am: fa87efb692 am: 89f8da8c0a am: 0ac8726f5c am: 60b07a4b32 am: 1b214827ab"