Merge "Switch to PCRE grep." am: d895c07ca0
am: 005359ece1

Change-Id: I7d35047229ad7ca0930b7744a9d2d0c763909c14