Merge "spmi: Debug-fs support for SPMI"