Merge "Fix issue #3074745: Crash in system process" into gingerbread