Merge "spmi: Inline a function to remove compilation error"