Merge "Revert "Fix VFY warning for VDC and AVDC about calling the new API on old platform."" into mnc-ub-dev