Merge "services/spm: Fix service UUID lookup" into integration