Merge "Avoid nested locking when calling from VDMS to VDs." into udc-dev