Merge "Remove obsolete vdc call." into klp-modular-dev