Cleanup validation regex's

Update the validation regexes to remove any unnecessary capture groups

Change-Id: I326fa7f5f860fd5a1a19c67339e0cfede19afce7
Merge "Cleanup validation regex's"