Merge "Fix error source of system server crashes" into qt-dev
am: c6351df463

Change-Id: I92168925b258974c2a8cac716fe818b3b87b9886