Merge "logpersist: switch to pgrep from ps"