Merge "Force only system uid can set uids allowed on restricted networks" into sc-dev