Merge "Migrate VCN to separate non-updatable libraries" into main