Merge "Better error message for AVD" into oc-dev