am 0c2eb842: am ede5a97a: Merge commit \'25b78c8a18327bd73c3d4d34887dd63953aeaa8c\' into lmp-mr1-dev

* commit '0c2eb84264c5c5a9f4c9e7187bf926296ee49511':
  Ensure default handler always is set if no other error handler registered