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

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