Merge "MediaMetrics: Garbage collection fixes" into rvc-dev am: 6da8961b4c am: 23b7b4c532

Change-Id: I19ee8252b19f26cfacd6564c2bce2a617f156a84