Merge branch 'origin/stable-3.9'

* stable-3.9:
  Support hyphen in name pre/post fixes of OWNERS files

Change-Id: I1593951c2a1e534c738044f706d22eb363ec6741