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

Change-Id: I0e5c56b3bbd9018c7ed3c1522c8a26befb382c7a