Merge "fix persistent process is killed and restart again and again" am: ae302cef am: b322dc38 am: 20a5fe41 am: de671ad0 Change-Id: Ic4dbc59df650a9477e97620091abb685a1fd2bc4