Merge "[TL02]Remove hidden API usage of NetworkAgent" into sc-dev