Merge "Add instrumentation to test NetworkAgent." into rvc-dev