Merge "Stop system process crash in TouchExplorer" into oc-dev
am: be70141ed6

Change-Id: I9b708860ca7fbb51088248b35fb8f88e771fa759