Using a correct regexp with match groups does help

Change-Id: I7e849aef712b0f8bfd09230b97b0597c86220078
Merge "Using a correct regexp with match groups does help" into production