Merge "Remove incorrect NonNull in VIMService" into udc-dev