Merge "Revert "Switch to PCRE grep."" am: 78f5431ff1
am: b46ad0e852

Change-Id: Ib1b9ed30084379a0950e5a0ca4b47b91a806765f