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

Change-Id: Ic993d10dadaea6a73a6ceb3c9448ec0cf49f0cac