Merge "Fix cts fail for PartitionedActivityTest" into rvc-dev