Merge "spmc: manifest changes to support two sample cactus secure partitions" into integration