Merge "8092: spmi: Remove extraneous aux-data entry"