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