Merge "Add macro to call event logger for errors. DO NOT MERGE" into klp-dev am: 809d5a0158 am: fd56dc41c7  -s ours
am: 362f13d74a

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