Merge "Throw exception if build config incorrect for VDC" into mnc-ub-dev