Merge "Fix failing testSetCrossProfilePackages cts test" into rvc-dev