Move network add/remove operations to a common function am: 950bec9c63 am: a072a71985
am: a48f92d07d

Change-Id: I4d39102fce0d511d484421bf54b5867901a1b31d