R1:058cb69308bb

Use the long-form "?P<...>" for named capturing subgroups since some versions of
stuff choke on the short form.

Summary:

Test Plan:

Reviewers:

CC: