Merge "Remove Persistent proccess without WTFing" into pi-dev
am: 4ea0a5a2df

Change-Id: I5438e638103171f33cfaf7d4d8c7538d93d61dd2