Merge "Revert^2 "Add sdk version check before skipping VcnManager initialization"" into main