Merge "Add isUsageSupportedForUpstreamType() helper method" into main