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

Change-Id: I09dbe007a20414ed8598b660bc2af59b221b6567