Merge "Move VCN utilities from services.jar to framework.jar" into main