Merge "spmi: Remove redundant controller list"