Merge "SPM: Get rid of uint32_t array representation of UUID" into integration