Merge "Fix memory leaks in mediaanalytics" am: f7902c01f8 am: 37062b54f3 am: eb8bcce11c
am: bcf74b1266

Change-Id: I501942313081ce6b10e2f2bcfba46f6d4313be22