Merge "Make NetworkController tests more deterministic"