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

Change-Id: Ie536da0d28b382b0197c02cc32eb6b95001e6a20