Merge "Add macro to call event logger for errors. DO NOT MERGE" into klp-dev am: 809d5a0158 am: fd56dc41c7  -s ours am: 362f13d74a am: 702fe6d486  -s ours am: ea1e6a59e7 am: 088639a20f  -s ours am: 55263d2ae3 am: 99cd21ef5c
am: 7b5fa175fa

* commit '7b5fa175fa3a1f288dde32330d8ba7b175a3fd75':
  Add macro to call event logger for errors. DO NOT MERGE