Merge "Switch to PCRE grep." am: 9aca01907d
am: f7b37121c6

Change-Id: Ibb6f40216cbde7c463c9b3100195da129419f722