Merge "[SUBID01-1]Grow NetworkIdentity to include a new mSubId field"