Created by: liuyang-li
Summary: Making the regex matching more robust.
Test Plan: buck test.
buck test
@sdwilsh