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

Change-Id: If2b17802b4d57e00f7fc96377534b63789481c95