Merge "Fix TunerResourceType in TunerHelper to match TunerResourceManager"