simplify regex

Change-Id: Ia03dfbb6e047cf14258d5c19c7513b08d68a8494