Merge "dataipa: Fix spearhead generic stats data type"