Merge "Conditionally remove VCN jars from non-updatable platform" into main