Merge "Update vCD 10 Compatibility"