Adding minor support to run HDP[12]_COMPONENT_VARIABLES also.