Merge "Fixing broken logging of OTHER events" into pi-dev
am: 706edbd776

Change-Id: Id4a2866e93e1c03c1e7a6b236175f2faae4cd6f6