Merge "Throw exception if build config incorrect for VDC" into mnc-ub-dev am: b0fbbfc685
am: 73b208391b

* commit '73b208391b14be0c8e9fd4d7a4e36a8f4c16da77':
  Throw exception if build config incorrect for VDC