Merge "Fix broken cst tests in ContextCrossProfileHostTest" into rvc-dev