Merge "Unbreak testStartUsingNetworkFeature_enableHipri failure"