Merge "Fix issue #3175809: system_server crash with SEGV_MAPERR (IKXEVEREST-1372)"