Merge "pid: switch to pgrep." am: 3aa9457410
am: 3140c7e495

Change-Id: Iaabe83d3fa5976d6b0bef1b070d571b4bf268fb6