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

Change-Id: I9a454463a8881dded9b3d7905d4cf76223b4acd4