Merge "[Aware] Remove dependency on INetworkAgent" into sc-dev