Merge "[Settings] Add owners to support network part" am: 661f006bb2 am: 0ed7376449

Change-Id: I480f8f481e200c3c551e621ba52e435c4fb0cf5b