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

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