Merge "Implement event logging for intent firewall" into jb-mr2-dev