Merge "Merge "Audio event logging" into oc-mr1-dev am: 9961d6968e am: 87dfc5bb4e"