Merge "Use Sdk36ModuleController to ensure VCN UT is only updated on B/B+" into main