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

Change-Id: I8b422c72121b30013a09722ee6911cc6550f4852