Merge "fix persistent process is killed and restart again and again"
am: ae302cef52

Change-Id: I31ead1fe09561e69df0cd94f366b2ef4648b29f3