Merge "Fix MultinetworkApiTest for instant mode"