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

Change-Id: Ie1802af0a6f22cb69c3b62f0912363a299f8f453