Merge "Add checks where fetching vdm could cause NPE" into udc-dev