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

Change-Id: I574558660e57b56a1f38b878fac8f25c84051cd7