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

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