Merge "Add the subId chceking before the DB write allowed network type" into sc-dev