Remove unnecessary regex grouping

Several regexes in this class used had unnecessary (\s+) grouping.  This
change makes the regexes slightly cheaper by removing the need for the
regex engine to remember the whitespace that was matched.

Change-Id: I9381c213efe093dc472b0c7e9d7b303a0c7cb13b
Merge "Remove unnecessary regex grouping"