Merge "Fix build for VDC" into mnc-ub-dev