Merge "Add null check for resolveInfo and Automotive feature." into rvc-dev