Merge "Update VcnManagementService javadoc based on new names of classes"