Bug: Missing restore_error_handler() call

Change-Id: If5966c4c204d0b89958fb64e61318955f7b987be
Merge "Bug: Missing restore_error_handler() call"