Merge "Fixes the system server crash issue caused by uncatched exception." am: b68106cf2a
am: ca7a43b5da

Change-Id: I51d5a6e7194a2fddfbedafbddb9816649ae4aa44