Merge "Add network agent to enhance NetworkProvider test"