Merge "SPM: Add owner to sp_layout gen"