Merge "Unbreak testStartUsingNetworkFeature_enableHipri failure" into rvc-dev