Merge "Fix for crash in system_server due to IndexOutOfBoundsException"