Merge "Fix memory leaks in mediaanalytics"
am: f7902c01f8

Change-Id: Ie78dbefaf12fb00fa8c4d1f352de87b43c7263bb