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

Change-Id: Ic4dbc59df650a9477e97620091abb685a1fd2bc4