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

Change-Id: Ic6443bfb6a3b03691909a4b3f6678d2d09acd00a