Merge "Correct cleanup when compacting metrics attributes" into oc-mr1-dev am: 66bc7b728c
am: a1a88b03cf

Change-Id: Ifdb2b46f3b34c33cf7595f607d53ede636cf3373