am 0c2eb842: am ede5a97a: Merge commit \'25b78c8a\' into lmp-mr1-dev * commit '0c2eb842': Ensure default handler always is set if no other error handler registered